Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 16 Jun 2010 22:49:55 +0000 (22:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 16 Jun 2010 22:49:55 +0000 (22:49 +0000)

Trivial merge